From: chris@kneesaa.uk.xensource.com <chris@kneesaa.uk.xensource.com>
Date: Sat, 8 Jul 2006 18:22:34 +0000 (+0100)
Subject: [BUILD] Fix re-use of existing config files in dist/install/boot.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15887
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=3d1d4c35fab8a2f2f90c8147cb72c4aee101f54c;p=xen.git

[BUILD] Fix re-use of existing config files in dist/install/boot.
- the name of the config file was computed incorrectly because of the
  linux version number 4th digit being present in both LINUX_VER and
  EXTRAVERSION extracted from the linux Makefile.
- DESTDIR was not set for the prep and config targets.

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>
---

diff --git a/buildconfigs/Rules.mk b/buildconfigs/Rules.mk
index 5e7d659a5b..0a508b782b 100644
--- a/buildconfigs/Rules.mk
+++ b/buildconfigs/Rules.mk
@@ -69,9 +69,6 @@ ref-%/.valid-ref: pristine-%/.valid-pristine
 	touch $@ # update timestamp to avoid rebuild
 endif
 
-%-prep:
-	$(MAKE) -f buildconfigs/mk.$* prep
-
 %-install:
 	$(MAKE) -f buildconfigs/mk.$* build
 
@@ -83,15 +80,20 @@ endif
 %-build: %-dist
 	@: # do nothing
 
+%-prep: DESTDIR=$(DISTDIR)/install
+%-prep:
+	$(MAKE) -f buildconfigs/mk.$* prep
+
+%-config: DESTDIR=$(DISTDIR)/install
+%-config:
+	$(MAKE) -f buildconfigs/mk.$* config
+
 %-delete:
 	$(MAKE) -f buildconfigs/mk.$* delete
 
 %-clean:
 	$(MAKE) -f buildconfigs/mk.$* clean
 
-%-config:
-	$(MAKE) -f buildconfigs/mk.$* config
-
 linux-2.6-xen.patch: ref-linux-$(LINUX_VER)/.valid-ref
 	rm -rf tmp-$@
 	cp -al $(<D) tmp-$@
diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index ce861acc1b..5de144259f 100644
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -5,6 +5,8 @@ EXTRAVERSION ?= xen
 
 LINUX_DIR    = linux-$(LINUX_VER)-$(EXTRAVERSION)
 
+LINUX_VER3  := $(LINUX_SERIES).$(word 3, $(subst ., ,$(LINUX_VER)))
+
 include buildconfigs/Rules.mk
 
 # The real action starts here!
@@ -25,8 +27,8 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
           LINUX_ARCH=$(LINUX_ARCH) bash ./mkbuildtree ../$(LINUX_DIR) )
 	# Re-use config from install dir if one exits else use default config
 	CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
-	[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
-	  cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
+	[ -r $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION-$(EXTRAVERSION) ] && \
+	  cp $(DESTDIR)/boot/config-$(LINUX_VER3)$$CONFIG_VERSION-$(EXTRAVERSION) $(LINUX_DIR)/.config \
 	  || cp buildconfigs/linux-defconfig_$(EXTRAVERSION)_$(XEN_TARGET_ARCH)$(XEN_SYSTYPE) \
 		$(LINUX_DIR)/.config
 	# See if we need to munge config to enable PAE